Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 19:43:46 +0000 (11:43 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 19:43:46 +0000 (11:43 -0800)
commitf0a42bdbbc756b6be2355d3049ca68512ba27872
treee13992adc40629d5fad3bd06a0e19337702b114d
parent7904d18ccc1a5ec27fea4a3e03e83e3a835ac9da
parentfe82ea4e3e70615a445931a70286c01a33ddfb44
Merge from mainline.